Resolve index problem