Fix for CalledFromWrongThreadException