Fixed : Regression on MakeOnSave since I fixed issue #8

It could maybe solved the Mike L. issue, I hope at least, any feedback welcome.