adjustment for android gen , should be tested more