fixed issue with names