Fix holiday calculation