This problem was solved in the latest patch, atleast for me. No workarounds needed anymore.