fixed entity loading