Added fix to controller