Fix calendar so it respects BST