Fix #SA-7