Fix for OTP 17