Addresses special casing scenario illustrated by #2