Fixed to work on Android