#69 refactor fix