fixed for xcode6