Fix for controllers