Fixed handling of keywords