Fixed issue: Issue #330