finish work on #479