Bug fix on android 3.0