Make work with OTP 17