Fixed Issue #289