SSH bug fix
Merge pull request #1433 from psav/fix_ssh_bug

SSH bug fix