Fix issue with hanging on login-shell.