diff --git a/filesystem/File.php b/filesystem/File.php
index c081d19d9..382e73e30 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -249,8 +249,8 @@ class File extends DataObject {
 	function canEdit($member = null) {
 		if(!$member) $member = Member::currentUser();
 		
-		$results = $this->extend('canEdit', $member);
-		if($results && is_array($results)) if(!min($results)) return false;
+		$result = $this->extendedCan('canEdit', $member);
+		if($result !== null) return $result;
 		
 		return Permission::checkMember($member, 'CMS_ACCESS_AssetAdmin');
 	}
@@ -261,8 +261,8 @@ class File extends DataObject {
 	function canCreate($member = null) {
 		if(!$member) $member = Member::currentUser();
 		
-		$results = $this->extend('canCreate', $member);
-		if($results && is_array($results)) if(!min($results)) return false;
+		$result = $this->extendedCan('canCreate', $member);
+		if($result !== null) return $result;
 		
 		return $this->canEdit($member);
 	}