Better fix for output files path(?)