Fix bug when keyword have '-'