Fix previous fixes for the case of non-parametric entities