temporary fix, causes sometiems item looses
some fixes