fix calendar behaviour