- Fix in case of no matching case
- Updated the positions