Tested with Android as well (map elements work fine there too). I can't test with Windows right now, if there is an issue, I can deal with that on another PR.
