Make sure changes to predecessor OSD are indexed correctly. Fixed #4