Fix for ticket #120 + cosmetic change.