diff --git a/filesystem/File.php b/filesystem/File.php
index af4f74f01..6c86e96c2 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -380,8 +380,11 @@ class File extends DataObject {
 	}
 
 	function getFilename() {
-		if($this->getField('Name')) return $this->getField('Filename');
-		else return 'assets/';
+		if($this->getField('Filename')) {
+			return $this->getField('Filename');
+		} else {
+			return 'assets/';
+		}
 	}
 
 	function setFilename($val) {