DAV-16 #fix: Fix wrong uid handling