Keyword parser commit fix