Fix #162 for good this time

Only one case left, see gh-bug-162d.scala. That's acceptable as a corner case...