Merge pull request #608 from guidosarducci/master-fix-uid-error