Fix calendar class