fix to controller