diff --git a/lib/private/comments/comment.php b/lib/private/comments/comment.php
index 31848ed38b..60663d6157 100644
--- a/lib/private/comments/comment.php
+++ b/lib/private/comments/comment.php
@@ -362,7 +362,7 @@ class Comment implements IComment {
 	protected function fromArray($data) {
 		foreach(array_keys($data) as $key) {
 			// translate DB keys to internal setter names
-			$setter = 'set' . str_replace('_', '', ucwords($key,'_'));
+			$setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
 			$setter = str_replace('Timestamp', 'DateTime', $setter);
 
 			if(method_exists($this, $setter)) {