bugfix and user supplied local path support