Fix @robhudson's shenanigans