Fix #3318