fixed echos
merged