Fixes #13 (in android)