closed #880 closed #912