Added the fix and it seems to be working.