Fixed #377.
Improved fix.
Merge pull request #380 from FezVrasta/ftpRemotesPicker

Fix #377