[1.2.6] Attempt to fix #1829