Fixed otp issue