current item fixes