Calendar bug partially fixed