Fix remote bug introduced by #115.
Merge pull request #121 from jharding/115-fix

Fix bug introduced in #115