More work on #1287