bugfix for android