Fixed stuck entity bug