corner case fix regressed others, reverting