Apparently working
Issue fixed on Android
Clean up