This voodoo seems to fix a lot of things