Another attempt to make coverage work