Bug fix for Issue #144.