better BWC support