2.0.0 bug fix