..., less buggy on ios

..., less buggy on ios