diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
index f29f7f84a9b4d8a48645fa85d93958c74f4bf1f8..cca68ab455b48833f3b9123a98a15b77ca7d9965 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
@@ -60,7 +60,7 @@
     }
     NSPredicate * predicate = [RCTAppleHealthKit predicateForSamplesBetweenDates:startDate endDate:endDate];
 
-    [self fetchQuantitySamplesOfType:weightType
+    [self fetchQuantityDoubleSamplesOfType:weightType
                                 unit:unit
                            predicate:predicate
                            ascending:ascending
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h
index 4ff706ca5056528c99dfde6dcfff56c15fd99a87..6531a0fa4bfb71ba8121b96763c07b6bb085ec83 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h
@@ -24,6 +24,12 @@
                          ascending:(BOOL)asc
                              limit:(NSUInteger)lim
                         completion:(void (^)(NSArray *, NSError *))completion;
+- (void)fetchQuantityDoubleSamplesOfType:(HKQuantityType *)quantityType
+                              unit:(HKUnit *)unit
+                         predicate:(NSPredicate *)predicate
+                         ascending:(BOOL)asc
+                             limit:(NSUInteger)lim
+                        completion:(void (^)(NSArray *, NSError *))completion;
 - (void)fetchCorrelationSamplesOfType:(HKQuantityType *)quantityType
                                  unit:(HKUnit *)unit
                             predicate:(NSPredicate *)predicate
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
index 504dcbf203e05cde09d95f3771b4c2c30bad6740..1c2a7830dc6057f9132716c2a7ce99efd4a8844f 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -129,6 +129,84 @@
 }
 
 
+- (void)fetchQuantityDoubleSamplesOfType:(HKQuantityType *)quantityType
+                              unit:(HKUnit *)unit
+                         predicate:(NSPredicate *)predicate
+                         ascending:(BOOL)asc
+                             limit:(NSUInteger)lim
+                        completion:(void (^)(NSArray *, NSError *))completion {
+    
+    NSSortDescriptor *timeSortDescriptor = [[NSSortDescriptor alloc] initWithKey:HKSampleSortIdentifierEndDate
+                                                                       ascending:asc];
+    
+    // declare the block
+    void (^handlerBlock)(HKSampleQuery *query, NSArray *results, NSError *error);
+    // create and assign the block
+    handlerBlock = ^(HKSampleQuery *query, NSArray *results, NSError *error) {
+        if (!results) {
+            if (completion) {
+                completion(nil, error);
+            }
+            return;
+        }
+        
+        if (completion) {
+            NSMutableArray *data = [NSMutableArray arrayWithCapacity:1];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                for (HKQuantitySample *sample in results) {
+                    HKQuantity *quantity = sample.quantity;
+                    double value = [quantity doubleValueForUnit:unit];
+                    
+                    int startDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.startDate];
+                    int endDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.endDate];
+                    
+                    NSString *deviceName = sample.device.name ? sample.device.name : @"";
+                    NSString *deviceManufacturer = sample.device.manufacturer ? sample.device.manufacturer : @"";
+                    NSString *deviceHardwareVer = sample.device.hardwareVersion ? sample.device.hardwareVersion : @"";
+                    NSString *deviceSoftwareVer = sample.device.softwareVersion ? sample.device.softwareVersion : @"";
+                    
+                    NSString *sourceName = sample.sourceRevision.source.name;
+                    NSString *sourceId = sample.sourceRevision.source.bundleIdentifier;
+                    
+                    NSString *uuid = sample.UUID.UUIDString;
+                    
+                    NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
+                    
+                    NSDictionary *elem = @{
+                                           @"value" : @(value),
+                                           @"startDate" : @(startDateTimestamp),
+                                           @"endDate" : @(endDateTimestamp),
+                                           @"deviceName" : deviceName,
+                                           @"deviceManufacturer" : deviceManufacturer,
+                                           @"deviceHardware" : deviceHardwareVer,
+                                           @"deviceSoftware" : deviceSoftwareVer,
+                                           @"sourceName" : sourceName,
+                                           @"sourceId" : sourceId,
+                                           @"unit" : unit.description,
+                                           @"uuid" : uuid,
+                                           @"metadata" : metadata
+                                           };
+                    
+                    [data addObject:elem];
+                }
+                
+                completion(data, error);
+            });
+        }
+    };
+    
+    HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:quantityType
+                                                           predicate:predicate
+                                                               limit:lim
+                                                     sortDescriptors:@[timeSortDescriptor]
+                                                      resultsHandler:handlerBlock];
+    
+    [self.healthStore executeQuery:query];
+}