Updated to fix bug when not using SSH