Fixed the wrapper and index wrapper.