fixing for xcode 6