Fix for Android/Windows