closed #2766 closed #2767 closed #2768