Add patch.
Momoless.
Fix tests.