Fix for find_by_nuid
Temp kludge till better solution