100% coverage! (and a small fix)