diff --git a/headers/private/interface/PictureDataWriter.h b/headers/private/interface/PictureDataWriter.h
index a2672e0cf0..9ee519d6bc 100644
--- a/headers/private/interface/PictureDataWriter.h
+++ b/headers/private/interface/PictureDataWriter.h
@@ -45,7 +45,7 @@ public:
 	status_t WriteSetFontRotation(const float &rotation);
 	status_t WriteSetFontEncoding(const int32 &encoding);
 	status_t WriteSetFontFlags(const int32 &flags);
-	status_t WriteSetFontShear(const int32 &shear);
+	status_t WriteSetFontShear(const float &shear);
 	status_t WriteSetFontFace(const int32 &face);
 
 	status_t WriteStrokeLine(const BPoint &start, const BPoint &end);
diff --git a/src/kits/interface/PictureDataWriter.cpp b/src/kits/interface/PictureDataWriter.cpp
index 8d459adce9..b03916a6ae 100644
--- a/src/kits/interface/PictureDataWriter.cpp
+++ b/src/kits/interface/PictureDataWriter.cpp
@@ -524,11 +524,11 @@ PictureDataWriter::WriteSetFontFlags(const int32 &flags)
 
 
 status_t
-PictureDataWriter::WriteSetFontShear(const int32 &shear)
+PictureDataWriter::WriteSetFontShear(const float &shear)
 {
 	try {
 		BeginOp(B_PIC_SET_FONT_SHEAR);
-		Write<int32>(shear);
+		Write<float>(shear);
 		EndOp();
 	} catch (status_t &status) {
 		return status;	
diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index 55a1e07a20..dcca8e6f07 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -858,10 +858,8 @@ ServerPicture::SetFontFromLink(BPrivate::LinkReceiver& link)
 	
 	if (mask & B_FONT_SHEAR) {
 		float shear;
-		link.Read<float>(&shear);
-		// TODO: For some reason writing the font shear
-		// results in missing font in Chart's BPictureButtons. Investigate.		
-		//WriteSetFontShear(shear);
+		link.Read<float>(&shear);	
+		WriteSetFontShear(shear);
 	}
 
 	if (mask & B_FONT_ROTATION) {