Better adhering to RFC 7231