Fixed Issue #335