Fixed #541: returns uid mapping properly