It was working before, besides the idx bug. Revert after this commit?