Fixed Issue #376