Fixed wrong entity handle