closed #1894 closed #1895 closed #1896