working on #636