Fixing to allow use of non-CWD paths