closed #881 closed #892