fixed android stuff?