Fixed problems with index formatting.