Fixed problem with file locations