Fix: Use entity