Change behavior.
Fix tests.