fix 6 calendar case