Really fix #2997