Fixed persistent dba handling