- fixed current item issue