Really fix #2703