Fixed Issue #313