Attempt to fix 1.9.2, too