diff --git a/sfall/Modules/Sound.cpp b/sfall/Modules/Sound.cpp
index 4eb282ba..95a1a3fe 100644
--- a/sfall/Modules/Sound.cpp
+++ b/sfall/Modules/Sound.cpp
@@ -352,6 +352,7 @@ static bool PrePlaySoundFile(PlayType playType, const wchar_t* file, bool isExis
 
 static const wchar_t *SoundExtensions[] = { L"mp3", L"wma", L"wav" };
 
+// TODO: Add DirectSound support for wav format
 static bool SearchAlternativeFormats(const char* path, PlayType playType, std::string &pathFile) {
 	size_t len = 0;
 	wchar_t wPath[MAX_PATH];
@@ -900,30 +901,28 @@ rawFile:
 ///////////////////////////////////////////////////////////////////////////////
 
 static fo::GameObject* relativeObject;
-static long relativeDistance = 0;
 
 static void __declspec(naked) gsound_compute_relative_volume_hook() {
 	__asm {
-		call fo::funcoffs::obj_dist_;
-		mov  relativeDistance, eax;
-		mov  relativeObject, ecx;
-		retn;
+		mov relativeObject, ecx;
+		jmp fo::funcoffs::win_get_rect_;
 	}
 }
 
 static void __fastcall SetPanPosition(fo::ACMSoundData* sound) {
-	if (relativeDistance <= 5) return;
+	if (!relativeObject) return;
 
-	long direction = fo::func::tile_dir(fo::var::obj_dude->tile, relativeObject->tile);
-	bool isRightSide = (direction <= 2);
+	long distance = fo::func::obj_dist(fo::var::obj_dude, relativeObject);
+	if (distance > 5) {
+		long direction = fo::func::tile_dir(fo::var::obj_dude->tile, relativeObject->tile);
+		bool isRightSide = (direction <= 2);
 
-	long panValue = (relativeDistance / 2) * 1000;
-	if (panValue > 10000) panValue = 10000;
+		long panValue = (distance - 5) * 100;
+		if (panValue > 10000) panValue = 10000;
 
-	if (!isRightSide) panValue = -panValue; // left mute 10000 ... -10000 right mute
-	sound->soundBuffer->SetPan(panValue);
-
-	relativeDistance = 0;
+		sound->soundBuffer->SetPan((isRightSide) ? panValue : -panValue); // left mute 10000 ... -10000 right mute
+	}
+	relativeObject = nullptr; // just in case
 }
 
 static void __declspec(naked) gsound_load_sound_volume_hook() {
@@ -946,7 +945,7 @@ void Sound::init() {
 
 	// Enable support for panning sfx sounds
 	SafeWrite8(0x45237E, (*(BYTE*)0x45237E) | 4); // set mode for DSBCAPS_CTRLPAN
-	HookCall(0x4515AC, gsound_compute_relative_volume_hook);
+	HookCall(0x45158D, gsound_compute_relative_volume_hook);
 	HookCall(0x451483, gsound_load_sound_volume_hook);
 
 	HookCall(0x44E816, gmovie_play_hook_pause);