Fix coverage as well