Fixed remove wbr bug