work on #1009