calendar behaviour seems to be acceptable now