Fixed directory var resolving