diff --git a/source/gui/widgets/group.cpp b/source/gui/widgets/group.cpp
index f1ca7821..9bb62ff1 100644
--- a/source/gui/widgets/group.cpp
+++ b/source/gui/widgets/group.cpp
@@ -235,6 +235,14 @@ checkbox& group::add_option(std::string text)
 	group& group::enable_format_caption(bool format)
 	{
 		impl_->caption.format(format);
+
+		// if the caption is already set, make sure the layout is updated
+		if(!caption().empty())
+		{
+			impl_->update_div();
+			impl_->place_content.collocate();
+			API::refresh_window(*this);
+		}
 		return *this;
 	}
 
diff --git a/source/paint/image.cpp b/source/paint/image.cpp
index 1781a657..53b71227 100644
--- a/source/paint/image.cpp
+++ b/source/paint/image.cpp
@@ -228,7 +228,7 @@ namespace paint
 						//JFIF
 						if (bytes > 11 && (0xe0ffd8ff == *reinterpret_cast<const unsigned*>(data)) && 0x4649464A == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))
 							ptr = std::make_shared<detail::image_jpeg>();
-						else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+5))) //Exif
+						else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))) //Exif
 							ptr = std::make_shared<detail::image_jpeg>();
 #endif
 						if ((!ptr) && (bytes > 40))