iOS 8 fix
iOS 8 compatibility fix