fix some bug for 1st time user