fix the issues of android part