Tweak to allow for testing during development.