Fixing an issue with index pages