2.2.2 bug fix