try to fix #822