Fixed : Regression on MakeOnSave since I fixed issue #8