Fix Keywords Bug