Fix recursive entity in software