Really fix #3318