few fixes from copy-paste of ioriginal index