Fixed double check of name