Catch an edge case

From @ericecook