--- /home/taco/context/20050831/tex/context/base/core-fig.tex	2005-08-01 16:26:18.000000000 +0200
+++ /home/taco/texmf/tex/context/base/core-fig.tex	2005-09-12 13:43:51.718018034 +0200
@@ -1053,9 +1053,11 @@
    #1[#4][#5][#6]%
    % prefix in runs > 1
    % prefix in runs > 1
-   \doifnotmode{\systemmodeprefix\v!first}
-     {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}%
-      \let\@@effiletype\empty}% beware, walks over the whole suffixlist
+   \doifsomething\@@efconversion % add test 
+     {\doifnotmode{\systemmodeprefix\v!first}
+        {\doifsomething\@@efprefix
+           {\edef\@@effilename{\@@efprefix\@@effilename}}%
+         \let\@@effiletype\empty}}% 
    % new, somehow needed when \textwidth is used:
    \doifsomething\@@efmaxwidth {\freezedimenmacro\@@efmaxwidth }%
    \doifsomething\@@efmaxheight{\freezedimenmacro\@@efmaxheight}%