should fix #2630