Fixed keyword bug