some correction for Xcode6.1