continue work on #255