WMC-40,WMC-39,WMC-38 fixed