Fixed Issue #354