Fix keywords and begin keywords overriding