Fixed android issue