Fix bug where CBC only was always set