Quick Fix for controller