Fix keyword2, keyword3 bug