fix to use environment vars