BW3 style fix
Merge