work on #594