work on #1279