Fixed issues with db, dd and dq