Another bug fix, v2.9.2