Fixes controls issue