Fix save-macro