fix #2116