[1.3.0] Fix #1912