fixed #1753: Android works ok now.