Fixed #280