Fix controller to work with Xcode 6.1