Corrected for separate custom-file.