Fixed 'hideControlOnEnd' issues..