db: adding @ workarounds