Monkey patching a issue so I can keep working on other things