Fixing Issue #48 with UID specs