closed #866 closed #933