clean [#261] up enough for 0.4