Further monkey patching.