Fix for MSSQL and DB2