v1.1.4.2 (r0022)

The previous revision didn't fix Issue 7, in fact it just made it worse.
This revision offers a partial fix for the issue.