Adding export vars fix 2