fix to use ID instead of filename