working on #749