CLC-2177 Another try at fixing type error in uid