Bug fix for controller types