Another attempt to fix mocking.