Fix for android bug
Merge branch 'mobile-bug'

* mobile-bug:
  Fix for android bug