Fix for incorrect first and lastname separator