Issue #SA-issue-1 is fixed