Need to wrap ENV vars in the conditional too.