Fix for "bits vs bytes" in BW