otp and pending problem fix