fixed android side