work on #1012