Fix for image extraction