diff --git a/kernel/trunk/fs/fs_lfn.inc b/kernel/trunk/fs/fs_lfn.inc
index f0ffec1b73..d28f20cf41 100644
--- a/kernel/trunk/fs/fs_lfn.inc
+++ b/kernel/trunk/fs/fs_lfn.inc
@@ -448,8 +448,10 @@ file_system_lfn:
         jz      @f
         mov     eax, dword[ebp+DISK.MediaInfo.Capacity]
         mov     edx, dword[ebp+DISK.MediaInfo.Capacity+4]
-        shld    edx, eax, 9
-        shl     eax, 9
+        mov     ecx, [ebp + DISK.MediaInfo.SectorSize]
+        bsf     ecx, ecx
+        shld    edx, eax, cl
+        shl     eax, cl
         mov     [edi+36], edx
         mov     [edi+32], eax
 @@:
diff --git a/kernel/trunk/fs/parse_fn.inc b/kernel/trunk/fs/parse_fn.inc
index cc2dfe5a44..32b9ab4179 100644
--- a/kernel/trunk/fs/parse_fn.inc
+++ b/kernel/trunk/fs/parse_fn.inc
@@ -71,7 +71,6 @@ else
         jne     .next_cd
 @@:
         ret
-end if
 
 .hard_disk:
         sub     al, '1'
@@ -82,6 +81,8 @@ end if
         mov     [ecx+9], dword 'IBRI'
         mov     [ecx+13], byte 0
         ret
+end if
+
 endp
 
 cp866toUpper: