Fixed Issue #294