Fixed --egoist behaviour