Test calendar fix