Fix Android start (3.1.0 does not work at all on Android)
