Fixing first name bug