BW-00010 Some Fix