Changed implementation to be tested.