Update for compatibility with OTP