fixed entity problem