Fixed issue caused by hyphen in surname!