partial fix android (can build error on run)
more for the android fix