Fix in retrieving current_file_name