Bug fix : HelperOptions & currentIndex