Fix #SA-9