working on #472