work on #629