closed #899 closed #999