Fixed a bug with Surname saving