Fixed previous commit (and removed a debug "echo")