bugfix for Android