FIX: calendar counter one more time