Fix how handles controllers