Fix for multiple images service and fallback