Added conditional evalution on @Current inside @Each