Bug fix (Issue #813)