try to make this work with older otp