corrections to resolving return to index