Yet another attempt at fixing code coverage. :(