Bugfix on android