Patch away buggy function