Fix #SA-6