The changes for fixing the fullName issue.