Fix for condtions DB V2