work on #1512