Fixed Android issue