more correct this way. doesn't do anything about this not getting handled correctly unfortunately CCBUG: 468793