another better fix for xcode 6.1