Bug - Fix Keywords  - Cases