Fixed Issue #295