Fixing with-data-file macro