Possible fix for entity derivation.