fixed android stuff