Removing echoes - apparently fixes a bug