fixed lastname firstname v2.0