Fix bug where first skipped entity skips remaining