Updated fix with hasControl

Updated the fix to use Matti's recommended hasControl technique instead
of a flag.