Hotfix for Android compatibility