- dirty fix to avoid empty db entries