Fixing so it works from the current directory and doesn't break things even further