[1.2.6] Fix #1912