Really fix BW this time