Adding export vars fix