closed #858 closed #924