controller fixes