Issue #11, a second bug squash.