try to fix #798