diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php
index 6a3dbfee1..a62f23702 100755
--- a/core/lib/Thelia/Core/Template/Loop/Image.php
+++ b/core/lib/Thelia/Core/Template/Loop/Image.php
@@ -93,7 +93,8 @@ class Image extends BaseI18nLoop
                                 new EnumType($this->possible_sources)
                         )
                 ),
-                Argument::createIntTypeArgument('source_id')
+                Argument::createIntTypeArgument('source_id'),
+                Argument::createBooleanTypeArgument('force_return', true)
         );
 
         // Add possible image sources
diff --git a/templates/default/index.html b/templates/default/index.html
index 36207f5e0..b762df42f 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -40,7 +40,7 @@
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
                                 <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="1" width="280" height="196" resize_mode="borders"}
+                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
                                 src="{$IMAGE_URL}"
                             {/loop}
                                 alt="Product #{$LOOP_COUNT}" >
@@ -99,7 +99,7 @@
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_promo" }
                             <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" force_return="1" width="218" height="146" resize_mode="borders"}
+                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" width="218" height="146" resize_mode="borders"}
                                         src="{$IMAGE_URL}"
                                     {/loop}
                                  alt="Product #{$LOOP_COUNT}" >
diff --git a/templates/default/product.html b/templates/default/product.html
index 329f674cd..2a7e81bc4 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -23,8 +23,7 @@
 
             <section id="product-gallery">
                 <figure class="product-image">
-                    {lang attr="id"} {lang attr="title"}
-                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1" force_return="true"}
+                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1"}
                         <img src="{$IMAGE_URL}" alt="{$TITLE}" class="img-responsive" itemprop="image" data-toggle="magnify">
                     {/loop}
                 </figure>
@@ -33,10 +32,10 @@
                     <div class="carousel-inner">
                         <div class="item active">
                             <ul>
-                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5" force_return="true"}
+                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5"}
                                 <li>
                                     <a href="{$IMAGE_URL}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
-                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders" force_return="true"}
+                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                             <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                         {/loop}
                                     </a>
@@ -48,10 +47,10 @@
                         <div class="item">
                             <ul>
 
-                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5" force_return="true"}
+                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5"}
                                     <li>
                                         <a href="{$IMAGE_URL}" class="thumbnail">
-                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop" force_return="true"}
+                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop"}
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                             {/loop}
                                         </a>