Fixed bug for android