Fix for Xcode6.1