Fixing the Echo fixes