Regenrate OTP issues fixed