[2.2] Fix #3220