Bug fix (temporary) to Issue #5