Fix for image handling
Change by Eclipse