Master

These are two corner cases I've encountered when playing with examples.