Bug Fixes

  - Bug fix on the wrap around