fixed entity fields