Another MS SQL attempt at the fix