Hack in a workaround for issue 227 in upstream repo