Modifications to address user controls bug