better handling for android app