Fixing for XCode 6.1