closed #865 closed #932