fixed keyword bugs