Made CDB work on 5.1