Fixed for Xcode 6.1 changes