Statement calendar some fix