fixed BW bug
merge