current item fixed hotfix