this link ref #950 and fix #822