Fixed #34 for iOS