Fix regression with rfc14 (#4676)