Updated default image handeling