Calendar bug fixed