new fix #822