Fix for SAS edits being overwritten by switch