work on #609