Fixed bug with names from old entries