Fix the uid/uid issue yet again