diff --git a/HexGrid/Image.pm b/HexGrid/Image.pm
index b94b6e4..6f0dddd 100644
--- a/HexGrid/Image.pm
+++ b/HexGrid/Image.pm
@@ -29,12 +29,11 @@ sub render($this, $container)
 	my $href = $this->{source};
 	if ($this->{fetch})
 	{
-		$this->_fetch_base64 unless defined($this->{_cached_data});
-		$href = $this->{_cached_data};
+		$href = $this->{_cached_data} // $this->_fetch_base64;
 	}
 	$image_element->{href} = $href;
-	$image_element->{width} = $this->{width} if defined($this->{width});
-	$image_element->{height} = $this->{height} if defined($this->{height});
+	$image_element->{width} = $this->{width};
+	$image_element->{height} = $this->{height};
 	return $image_element;
 }