Possible fix for AUTUpStageTeam/UpStage2013#46