I'm wondering if this monkeypatching should go somewhere else (like in util?)