fixed entity fields reference