Fixed issue with default filenames and following params