Add protection against entity collision