Fixed issue #280