Quick fix for Issue #477

From pull request #484 by michaelobriena