Bug fix on full names