redo above commit correctly
(#25)