BUGFIX: -Problem with path and filename fixed