[Fix] a bug where Bs,Hs,Ws woudl not be detected