#1728: more work on this