Fix for DBAL-209

Fix for DBAL-209