Hotfix 20140116 for controller