diff --git a/FDTake.podspec b/FDTake.podspec
index 3b2e112..4766982 100644
--- a/FDTake.podspec
+++ b/FDTake.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "FDTake"
-  s.version      = "3.0.0"
+  s.version      = "3.0.1"
   s.summary      = "Easily take a photo or video or choose from library"
   s.description  = <<-DESC
                    `FDTake` helps you quickly to have the user take or choose an existing photo or video.
diff --git a/Sources/FDTake/FDTakeController.swift b/Sources/FDTake/FDTakeController.swift
index 7017f9c..e022a0a 100644
--- a/Sources/FDTake/FDTakeController.swift
+++ b/Sources/FDTake/FDTakeController.swift
@@ -197,7 +197,7 @@ open class FDTakeController: NSObject {
         if self.allowsSelectFromLibrary {
             if UIImagePickerController.isSourceTypeAvailable(.photoLibrary) {
                 titleToSource.append((buttonTitle: .chooseFromLibrary, source: .photoLibrary))
-                titleToSource.append((buttonTitle: .lastTakenMedia, source: .photoLibrary))
+                // titleToSource.append((buttonTitle: .lastTakenMedia, source: .photoLibrary))
             } else if UIImagePickerController.isSourceTypeAvailable(.savedPhotosAlbum) {
                 titleToSource.append((buttonTitle: .chooseFromPhotoRoll, source: .savedPhotosAlbum))
             }
@@ -236,12 +236,18 @@ open class FDTakeController: NSObject {
                 // set the media type: photo or video
                 self.imagePicker.allowsEditing = self.allowsEditing
                 var mediaTypes = [String]()
-                if self.allowsPhoto {
+                if self.allowsPhoto && title == .takePhoto {
+                    // take photo choisen
+                    mediaTypes.append(String(kUTTypeImage))
+                } else if self.allowsVideo && title == .takeVideo {
+                    // take video choisen
+                    mediaTypes.append(String(kUTTypeMovie))
+                } else if self.allowsTake {
+                    // take from library
                     mediaTypes.append(String(kUTTypeImage))
-                }
-                if self.allowsVideo {
                     mediaTypes.append(String(kUTTypeMovie))
                 }
+                
                 self.imagePicker.mediaTypes = mediaTypes
 
                 if title == .lastTakenMedia {
@@ -261,6 +267,7 @@ open class FDTakeController: NSObject {
                         // On iPad use pop-overs.
                         self.imagePicker.modalPresentationStyle = .popover
                         self.imagePicker.popoverPresentationController?.sourceRect = popOverPresentRect
+                        self.imagePicker.popoverPresentationController?.sourceView = self.presentingView
                         topVC.present(self.imagePicker, animated: true, completion: nil)
                     }
                 }