Fix #3220