6.2 bug fix