Fixed a race condition, now works on CC 3.0 and above
Authored by: achalk124 2014-02-04
Parent: [r510]
Child: [r512]