closed #1317
closed #1080