P1 bug fix for prod