Fixed base-switch bug