Fixed starred items inf loop