Fix saving modules