Fixed failing DBD test
Restoring intended behaviour... I think