work on #1660