Merge pull request #1693 from Garciat/fix-assembly-get-satellite