Fixed for strange version of echo