Fix for inline entity instance regression