I'd rather you fixed #278 instead of working around it with this.