yet more RFC complance