Fxed missing vars