work on #1160