closed #1321 closed #1036