*Addendum to the earlier segfault fix which was incomplete