improved android compatibilty