correct save/remove behiour of enum indexes ,fixes #2703

I don't think so, I just wrote one for to prove there is a defect.