Commit 24b: Fix for bug #138. (Bigger fix coming soon with many other
changes, but since it is taking longer than expected, I decided to pull
this specific fix out, and expedite it...)