iOS 8 fix

Fixes #216