Implement a code fix for SA1000 (fixes #171)