Fix wbr removing bug