current item bug fixed