Better version of the patch.