Fix for xcode 6.1