Fix: missing current entity record