work on #989