keyword bug fixed