Increased coverage (and fixed a bug)