Fixing mssql
Merge pull request #592 from mposolda/db-fix

Fixing mssql