diff --git a/FileSaver.js b/FileSaver.js
index 6415073..4d1bd32 100644
--- a/FileSaver.js
+++ b/FileSaver.js
@@ -94,13 +94,13 @@ var saveAs = saveAs || (function(view) {
 				}
 				// on any filesys errors revert to saving with object URLs
 				, fs_error = function() {
-					if (target_view && typeof safari !== "undefined" && typeof FileReader !== "undefined") {
+					if (target_view && /Version\/[\d\.]+.*Safari/.test(navigator.userAgent) && typeof FileReader !== "undefined") {
 						// Safari doesn't allow downloading of blob urls
 						var reader = new FileReader();
 						reader.onloadend = function() {
 							var base64Data = reader.result;
 							base64Data = base64Data.replace(/^data:.*?;/, 'data:attachment/file;');
-							target_view.location.href = encodeURI(base64Data);
+							target_view.location.href = base64Data;
 							filesaver.readyState = filesaver.DONE;
 							dispatch_all();
 						};