Fixed calendar update with flatMap