Merge pull request #9309 from TonyBlit/fix_sat_list