Bug Fix for 'disable on rotation' bug