iOS and Android compatibility issue fixed