@adonath - could you add a test of this case? (and an even case?)