keywords bugfix