Index calendar fix