changes for android issue
Changes for android issue