1diff --git a/src/Objects/DeviceFormatter.vala b/src/Objects/DeviceFormatter.vala
2index cf6a3b8..0de10a9 100644
3--- a/src/Objects/DeviceFormatter.vala
4+++ b/src/Objects/DeviceFormatter.vala
5@@ -62,42 +62,42 @@ namespace Formatter {
6 string drive_identifier = drive.get_identifier ("unix-device");
7 switch (filesystem) {
8 case Formatter.Filesystems.EXT4:
9- spawn_args = {"pkexec", "mkfs.ext4", drive_identifier, "-F"};
10+ spawn_args = {"pkexec", "@ext4@", drive_identifier, "-F"};
11 if (label != "") {
12 spawn_args += "-L";
13 spawn_args += label;
14 }
15 break;
16 case Formatter.Filesystems.EXFAT:
17- spawn_args = {"pkexec", "mkfs.exfat", drive_identifier};
18+ spawn_args = {"pkexec", "@exfat@", drive_identifier};
19 if (label != "") {
20 spawn_args += "-n";
21 spawn_args += label;
22 }
23 break;
24 case Formatter.Filesystems.FAT16:
25- spawn_args = {"pkexec", "mkfs.fat", "-F16", "-I", drive_identifier};
26+ spawn_args = {"pkexec", "@fat@", "-F16", "-I", drive_identifier};
27 if (label != "") {
28 spawn_args += "-n";
29 spawn_args += label;
30 }
31 break;
32 case Formatter.Filesystems.FAT32:
33- spawn_args = {"pkexec", "mkfs.fat", "-F32", "-I", drive_identifier};
34+ spawn_args = {"pkexec", "@fat@", "-F32", "-I", drive_identifier};
35 if (label != "") {
36 spawn_args += "-n";
37 spawn_args += label;
38 }
39 break;
40 case Formatter.Filesystems.NTFS:
41- spawn_args = {"pkexec", "mkfs.ntfs", drive_identifier, "-f", "-F"};
42+ spawn_args = {"pkexec", "@ntfs@", drive_identifier, "-f", "-F"};
43 if (label != "") {
44 spawn_args += "-L";
45 spawn_args += label;
46 }
47 break;
48 case Formatter.Filesystems.HFS_PLUS:
49- spawn_args = {"pkexec", "mkfs.hfsplus", drive_identifier};
50+ spawn_args = {"pkexec", "@hfsplus@", drive_identifier};
51 if (label != "") {
52 spawn_args += "-v";
53 spawn_args += label;