Fixed and tested in android.