diff --git a/changes/3.2.0.md b/changes/3.2.0.md
index 613bcb0ed..2221a3e6d 100644
--- a/changes/3.2.0.md
+++ b/changes/3.2.0.md
@@ -7,3 +7,4 @@
  * Add straight-line variant for `1` (#573).
  * Cover all the characters in CP437 (#577).
  * Add parenthesis variant with larger contour (#570).
+ * Fix placement of U+0315 COMBINING COMMA ABOVE RIGHT (#583).
\ No newline at end of file
diff --git a/glyphs/overmarks.ptl b/glyphs/overmarks.ptl
index dba2e1c72..d9749d9da 100644
--- a/glyphs/overmarks.ptl
+++ b/glyphs/overmarks.ptl
@@ -1113,19 +1113,20 @@ glyph-block Overmarks : begin
 
 	sketch # dotTR
 		set-width 0
-		include : Ring (XH + Accent + DotRadius) (XH + Accent - DotRadius) (0 - DotRadius) (0 + DotRadius) true
+		include : refer-glyph "dotAbove"
+		apply-transform : Upright
+		apply-transform : Translate (RightSB - Middle + DotRadius) 0
+		apply-transform : Italify
 		set-anchor 'topright' MARK 0 XH 0 aboveMarkTop
-
 		save 'dotTR' 0x358
 
 	sketch # commaTR
 		set-width 0
 		include : refer-glyph "commaAbove"
 		apply-transform : Upright
-		apply-transform : Translate (RightSB - Middle - OX) (XH - aboveMarkTop - commaOvershoot)
+		apply-transform : Translate (RightSB - Middle + DotRadius) 0
 		apply-transform : Italify
 		set-anchor 'topright' MARK 0 XH 0 aboveMarkTop
-
 		save 'commaTR' 0x315
 
 	sketch # rtailBR