Fix keywords type changing