Better debug info.
Oops; fix bug!