keyword removal bug fix