Fixing Android issue