diff --git a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
index 32153ff99..ef4d93743 100644
--- a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
+++ b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
@@ -477,19 +477,23 @@ namespace Xamarin.Forms.Build.Tasks
 			getter.Body.InitLocals = true;
 			var il = getter.Body.GetILProcessor();
 
-			if (tSourceRef.IsValueType)
-				il.Emit(Ldarga_S, (byte)0);
-			else
+			if (properties == null || properties.Count == 0) { //return self
 				il.Emit(Ldarg_0);
+				il.Emit(Ret);
+			}
+			else {
+				if (tSourceRef.IsValueType)
+					il.Emit(Ldarga_S, (byte)0);
+				else
+					il.Emit(Ldarg_0);
 
-			if (properties != null && properties.Count != 0) {
 				foreach (var propTuple in properties) {
 					var property = propTuple.Item1;
 					var indexerArg = propTuple.Item2;
 					if (indexerArg != null) {
-						if (property.GetMethod.Parameters [0].ParameterType == module.TypeSystem.String)
+						if (property.GetMethod.Parameters[0].ParameterType == module.TypeSystem.String)
 							il.Emit(Ldstr, indexerArg);
-						else if (property.GetMethod.Parameters [0].ParameterType == module.TypeSystem.Int32) {
+						else if (property.GetMethod.Parameters[0].ParameterType == module.TypeSystem.Int32) {
 							int index;
 							if (!int.TryParse(indexerArg, out index))
 								throw new XamlParseException($"Binding: {indexerArg} could not be parsed as an index for a {property.Name}", node as IXmlLineInfo);
@@ -500,11 +504,10 @@ namespace Xamarin.Forms.Build.Tasks
 						il.Emit(Callvirt, module.ImportReference(property.GetMethod));
 					else
 						il.Emit(Call, module.ImportReference(property.GetMethod));
-				}
+					}
+
+				il.Emit(Ret);
 			}
-
-			il.Emit(Ret);
-
 			context.Body.Method.DeclaringType.Methods.Add(getter);
 
 			var funcRef = module.ImportReference(typeof(Func<,>));
diff --git a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml b/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml
index eb906903a..e21f7bb04 100644
--- a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml
+++ b/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml
@@ -16,6 +16,7 @@
             <Label Text="{Binding I}" x:Name="label5" />
             <Label Text="{Binding Model.Text}" x:Name="label6" x:DataType="local:MockStructViewModel" />
 			<Entry Text="{Binding Text, Mode=TwoWay}" x:Name="entry0"/>
+            <Label Text="{Binding .}" x:Name="label7" x:DataType="sys:Int32"/>
 		</StackLayout>
 		<Label Text="{Binding Text}" x:Name="labelWithUncompiledBinding" />
 	</StackLayout>
diff --git a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs
index 7281716c7..d22d716ac 100644
--- a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs
@@ -73,6 +73,8 @@ namespace Xamarin.Forms.Xaml.UnitTests
 				//testing selfPath
 				layout.label4.BindingContext = "Self";
 				Assert.AreEqual("Self", layout.label4.Text);
+				layout.label7.BindingContext = 42;
+				Assert.That(layout.label7.Text, Is.EqualTo("42"));
 
 				//testing INPC
 				vm.Text = "Text2";