Fix for DBCore crash