Implement fixed due to Boris Batyunya. Including a fix for a bug with the

No match.