Fixed Calendar display bug