fix, with debug echos