working on #691