Fixing so it works on remote computers.
It's a bit sloppy, but it works.