more RFC complance