Added SAS-mode bug fix.