Fixed Issue #320