fixed index registration
merged