diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index cbc81214..9c165efb 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -592,9 +592,9 @@ bool GParted_Core::apply_operation_to_disk( Operation * operation )
 		case OPERATION_CHECK:
 			success =    calibrate_partition( operation->get_partition_original(),
 			                                  operation->operation_detail )
-			          && check_repair_filesystem( operation->get_partition_original(),
+			          && check_repair_filesystem( operation->get_partition_original().get_filesystem_partition(),
 			                                      operation->operation_detail )
-			          && maximize_filesystem( operation->get_partition_original(),
+			          && maximize_filesystem( operation->get_partition_original().get_filesystem_partition(),
 			                                  operation->operation_detail );
 			break;
 
diff --git a/src/OperationCheck.cc b/src/OperationCheck.cc
index b92aa775..74b73f72 100644
--- a/src/OperationCheck.cc
+++ b/src/OperationCheck.cc
@@ -48,7 +48,7 @@ void OperationCheck::create_description()
 
 	/*TO TRANSLATORS: looks like  Check and repair file system (ext3) on /dev/hda4 */
 	description = String::ucompose( _("Check and repair file system (%1) on %2"),
-	                                Utils::get_filesystem_string( partition_original->filesystem ),
+	                                partition_original->get_filesystem_string(),
 	                                partition_original->get_path() );
 }
 
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 3f0ba223..d166e7b7 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -1275,7 +1275,7 @@ void Win_GParted::set_valid_operations()
 			allow_paste( true );
 
 		//see if we can somehow check/repair this file system....
-		if ( fs.check && selected_partition_ptr->status == STAT_REAL )
+		if ( selected_partition_ptr->status == STAT_REAL && fs_cap.check )
 			allow_check( true ) ;
 	}
 }