Bugfix for android