final fix to controller