Make it more entity safe.