fixes, controller