bug fix for controls