Fixed small issue with %ECHO% being used.