[1.2.4] Fix #1314