working on #752