work on #1351