work on #1382