Fix for ENV substitution in command