Applied android fix from Marco B.