work on #1285