Fix monkey-patch