[1.2.5] Fix #1480