Fixed Issue #288