Fixed conversion to BW2