Missed an edge case for issue #1