wpo bug fix