Fix for some controls