Fix for parallel entity processing