Fixing keywordp bug