Fix for Controls