env. variable replacement fixed