save & fix