Fixed to keep compatibility with Android