Fix #3318
Really fix #3318