work on #335
work on #335