fixed DB helpers