CurrentAndNext desc fix