Fixes issue with echo-based commands