Bug fix Issue #32