closed #1929 closed #1941