Forgot to remove echo