Improved compliance against RFC 7033