fixlastnameissue (reverted from commit 704aadbb3929a500af4769fcf76d0f1e3321c262)