work on #329