Fix handeling of pictures vs text.