Undo issue #18, fixing CF