bug fix for an issue on Android