Work around new entity candidate behavior in Boron