work on #1292