Fixed Issue #280