diff --git a/headers/private/storage/PathMonitor.h b/headers/private/storage/PathMonitor.h
index 657162d269..f623e9c252 100644
--- a/headers/private/storage/PathMonitor.h
+++ b/headers/private/storage/PathMonitor.h
@@ -28,11 +28,11 @@ public:
 
 public:
 	static	status_t			StartWatching(const char* path, uint32 flags,
-									BMessenger target);
+									const BMessenger& target);
 
 	static	status_t			StopWatching(const char* path,
-									BMessenger target);
-	static	status_t			StopWatching(BMessenger target);
+									const BMessenger& target);
+	static	status_t			StopWatching(const BMessenger& target);
 
 	static	void				SetWatchingInterface(
 									BWatchingInterface* watchingInterface);
diff --git a/src/kits/storage/PathMonitor.cpp b/src/kits/storage/PathMonitor.cpp
index 9763280d05..a782171da2 100644
--- a/src/kits/storage/PathMonitor.cpp
+++ b/src/kits/storage/PathMonitor.cpp
@@ -1016,7 +1016,8 @@ BPathMonitor::_Init()
 
 
 /*static*/ status_t
-BPathMonitor::StartWatching(const char* path, uint32 flags, BMessenger target)
+BPathMonitor::StartWatching(const char* path, uint32 flags,
+	const BMessenger& target)
 {
 	TRACE("StartWatching(%s)\n", path);
 
@@ -1056,7 +1057,7 @@ BPathMonitor::StartWatching(const char* path, uint32 flags, BMessenger target)
 
 
 /*static*/ status_t
-BPathMonitor::StopWatching(const char* path, BMessenger target)
+BPathMonitor::StopWatching(const char* path, const BMessenger& target)
 {
 	if (sLocker == NULL)
 		return B_NO_INIT;
@@ -1090,7 +1091,7 @@ BPathMonitor::StopWatching(const char* path, BMessenger target)
 
 
 /*static*/ status_t
-BPathMonitor::StopWatching(BMessenger target)
+BPathMonitor::StopWatching(const BMessenger& target)
 {
 	if (sLocker == NULL)
 		return B_NO_INIT;