Fixed Android return issue + changes