Fix save by click