Always another corner case...

- Deals with cut validation corner cases (see comments)