Fixed save-vanishing problem