Fix for RFC 248