Changed:
*Fixed another entity related crash