keyword bug fix