Workaround for #7 but it ain't pretty
More #7 patching