fixing bugs in wbc