Fixed items being deleted after map change