finish work on #657