Fixing #98 and #99 - problems with exif on some images