more work on #416