closed #856 closed #922