Index and Register RWD fix