p1 bug fix