This should address inaturalist/inaturalist#333