diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index eab53150d..fa7fcb9c3 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -1108,7 +1108,13 @@ class TemplateHandler
 			return '';
 		}
 		
-		return preg_replace_callback('@(?<!::|\\\\|(?<!eval\()\')\$([a-z_][a-z0-9_]*)@i', function($matches) {
+		// Replace some variables that need to be enclosed in curly braces.
+		$php = preg_replace_callback('@(?<!\$__Context)->\$([a-z_][a-z0-9_]*)@i', function($matches) {
+			return '->{$__Context->' . $matches[1] . '}';
+		}, $php);
+		
+		// Replace all other variables with Context attributes.
+		$php = preg_replace_callback('@(?<!::|\\\\|\$__Context->|(?<!eval\()\')\$([a-z_][a-z0-9_]*)@i', function($matches) {
 			if (preg_match('/^(?:GLOBALS|_SERVER|_COOKIE|_GET|_POST|_REQUEST|_SESSION|__Context|this|lang)$/', $matches[1]))
 			{
 				return '$' . $matches[1];
@@ -1118,6 +1124,8 @@ class TemplateHandler
 				return '$__Context->' . $matches[1];
 			}
 		}, $php);
+		
+		return $php;
 	}
 
 }
diff --git a/tests/unit/classes/TemplateHandlerTest.php b/tests/unit/classes/TemplateHandlerTest.php
index d2a4ba124..1bde836c5 100644
--- a/tests/unit/classes/TemplateHandlerTest.php
+++ b/tests/unit/classes/TemplateHandlerTest.php
@@ -315,6 +315,15 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             array(
                 '<span>{\RX_BASEDIR}</span>',
                 '?><span><?php echo \RX_BASEDIR ?></span>'
+            ),
+			// Rhymix improvements: object attributes enclosed in curly braces
+            array(
+                '<div>{$foo->$bar[$bazz]}</div>',
+                '?><div><?php echo $__Context->foo->{$__Context->bar}[$__Context->bazz] ?></div>'
+            ),
+            array(
+                '<!--@if($foo->$bar)--><div></div><!--@endif-->',
+                "\n" . 'if($__Context->foo->{$__Context->bar}){ ?><div></div><?php } ?>'
             ),
 			// Rhymix autoescape
             array(