Fix up preset selection with two APCs