closed #846 closed #926