improved monkeypatching :)