I think this commit fix the bug for iOS #222