oops; just introduced a bug; cleaning up