Fix race condition with default Vars