fixing bugs (by firstSignin)