Fix for DBAL-209
Merge pull request #240 from nemekzg/DBAL-209

Fix for DBAL-209