diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index bee9f420f..28c4cb48a 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -2509,7 +2509,7 @@ setBoundsOrigin:
 
     var frame = [self rectForEphemeralSubviewNamed:aViewName];
 
-    if (frame && !_CGRectIsEmpty(frame))
+    if (frame)
     {
         if (!_ephemeralSubviewsForNames[aViewName])
         {
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/AppController.j b/Tests/Manual/layoutEphemeralSubviewTest/AppController.j
new file mode 100644
index 000000000..14932a323
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/AppController.j
@@ -0,0 +1,160 @@
+/*
+ * AppController.j
+ * layoutEphemeralSubviewTest
+ *
+ * Created by Aparajita Fishman on October 8, 2010.
+ */
+
+@import <Foundation/CPObject.j>
+
+
+@implementation AppController : CPObject
+{
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, 300, 250) styleMask:CPTitledWindowMask],
+        contentView = [theWindow contentView],
+        radio = [[OldRadio alloc] initWithFrame:CGRectMakeZero()];
+
+    [theWindow center];
+    [theWindow setTitle:@"layoutEphemeralSubview Test"];
+
+    var label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 15, 270, 80)];
+
+    [label setLineBreakMode:CPLineBreakByWordWrapping];
+    [label setStringValue:@"These checkboxes and radio buttons were created with an empty frame, then sized to fit. " +
+                          @"Notice that the ones with the old code truncate the image, whereas the ones made with " +
+                          @"the new code size correctly."];
+    [label setFrameOrigin:CGPointMake(15, 20)];
+    [contentView addSubview:label];
+
+    label = [CPTextField labelWithTitle:@"Old code:"];
+    [label setFrameOrigin:CGPointMake(15, 120)];
+    [contentView addSubview:label];
+
+    var checkbox = [[OldCheckBox alloc] initWithFrame:CGRectMakeZero()];
+
+    [checkbox sizeToFit];
+    [checkbox setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))];
+    [contentView addSubview:checkbox];
+
+    label = [CPTextField labelWithTitle:@"New code:"],
+    [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([checkbox frame]) + 10)];
+    [contentView addSubview:label];
+
+    checkbox = [[CPCheckBox alloc] initWithFrame:CGRectMakeZero()];
+    [checkbox sizeToFit];
+    [checkbox setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))];
+    [contentView addSubview:checkbox];
+
+    label = [CPTextField labelWithTitle:@"Old code:"];
+    [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([checkbox frame]) + 10)];
+    [contentView addSubview:label];
+
+    var radio = [[OldRadio alloc] initWithFrame:CGRectMakeZero()];
+
+    [radio sizeToFit];
+    [radio setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))];
+    [contentView addSubview:radio];
+
+    label = [CPTextField labelWithTitle:@"New code:"],
+    [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([radio frame]) + 10)];
+    [contentView addSubview:label];
+
+    radio = [[CPRadio alloc] initWithFrame:CGRectMakeZero()];
+    [radio sizeToFit];
+    [radio setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))];
+    [contentView addSubview:radio];
+
+    [theWindow orderFront:self];
+}
+
+@end
+
+
+@implementation OldCheckBox : CPCheckBox
+
+- (CPView)layoutEphemeralSubviewNamed:(CPString)aViewName
+                           positioned:(CPWindowOrderingMode)anOrderingMode
+      relativeToEphemeralSubviewNamed:(CPString)relativeToViewName
+{
+    if (!_ephemeralSubviewsForNames)
+    {
+        _ephemeralSubviewsForNames = {};
+        _ephemeralSubviews = [CPSet set];
+    }
+
+    var frame = [self rectForEphemeralSubviewNamed:aViewName];
+
+    if (frame && !CGRectIsEmpty(frame))
+    {
+        if (!_ephemeralSubviewsForNames[aViewName])
+        {
+            _ephemeralSubviewsForNames[aViewName] = [self createEphemeralSubviewNamed:aViewName];
+
+            [_ephemeralSubviews addObject:_ephemeralSubviewsForNames[aViewName]];
+
+            if (_ephemeralSubviewsForNames[aViewName])
+                [self addSubview:_ephemeralSubviewsForNames[aViewName] positioned:anOrderingMode relativeTo:_ephemeralSubviewsForNames[relativeToViewName]];
+        }
+
+        if (_ephemeralSubviewsForNames[aViewName])
+            [_ephemeralSubviewsForNames[aViewName] setFrame:frame];
+    }
+    else if (_ephemeralSubviewsForNames[aViewName])
+    {
+        [_ephemeralSubviewsForNames[aViewName] removeFromSuperview];
+
+        [_ephemeralSubviews removeObject:_ephemeralSubviewsForNames[aViewName]];
+        delete _ephemeralSubviewsForNames[aViewName];
+    }
+
+    return _ephemeralSubviewsForNames[aViewName];
+}
+
+@end
+
+
+@implementation OldRadio : CPRadio
+
+- (CPView)layoutEphemeralSubviewNamed:(CPString)aViewName
+                           positioned:(CPWindowOrderingMode)anOrderingMode
+      relativeToEphemeralSubviewNamed:(CPString)relativeToViewName
+{
+    if (!_ephemeralSubviewsForNames)
+    {
+        _ephemeralSubviewsForNames = {};
+        _ephemeralSubviews = [CPSet set];
+    }
+
+    var frame = [self rectForEphemeralSubviewNamed:aViewName];
+
+    if (frame && !CGRectIsEmpty(frame))
+    {
+        if (!_ephemeralSubviewsForNames[aViewName])
+        {
+            _ephemeralSubviewsForNames[aViewName] = [self createEphemeralSubviewNamed:aViewName];
+
+            [_ephemeralSubviews addObject:_ephemeralSubviewsForNames[aViewName]];
+
+            if (_ephemeralSubviewsForNames[aViewName])
+                [self addSubview:_ephemeralSubviewsForNames[aViewName] positioned:anOrderingMode relativeTo:_ephemeralSubviewsForNames[relativeToViewName]];
+        }
+
+        if (_ephemeralSubviewsForNames[aViewName])
+            [_ephemeralSubviewsForNames[aViewName] setFrame:frame];
+    }
+    else if (_ephemeralSubviewsForNames[aViewName])
+    {
+        [_ephemeralSubviewsForNames[aViewName] removeFromSuperview];
+
+        [_ephemeralSubviews removeObject:_ephemeralSubviewsForNames[aViewName]];
+        delete _ephemeralSubviewsForNames[aViewName];
+    }
+
+    return _ephemeralSubviewsForNames[aViewName];
+}
+
+@end
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Info.plist b/Tests/Manual/layoutEphemeralSubviewTest/Info.plist
new file mode 100644
index 000000000..162e3e867
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CPApplicationDelegateClass</key>
+    <string>AppController</string>
+    <key>CPBundleName</key>
+    <string>layoutEphemeralSubviewTest</string>
+    <key>CPPrincipalClass</key>
+    <string>CPApplication</string>
+</dict>
+</plist>
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Jakefile b/Tests/Manual/layoutEphemeralSubviewTest/Jakefile
new file mode 100644
index 000000000..ed17fe26b
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/Jakefile
@@ -0,0 +1,92 @@
+/*
+ * Jakefile
+ * layoutEphemeralSubviewTest
+ *
+ * Created by Aparajita Fishman on October 8, 2010.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("layoutEphemeralSubviewTest", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "layoutEphemeralSubviewTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("layoutEphemeralSubviewTest");
+    task.setIdentifier("com.yourcompany.layoutEphemeralSubviewTest");
+    task.setVersion("1.0");
+    task.setAuthor("WireLoad, LLC");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("layoutEphemeralSubviewTest");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["layoutEphemeralSubviewTest"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "layoutEphemeralSubviewTest", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "layoutEphemeralSubviewTest", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "layoutEphemeralSubviewTest"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "layoutEphemeralSubviewTest"), FILE.join("Build", "Deployment", "layoutEphemeralSubviewTest")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "layoutEphemeralSubviewTest"), FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest", "layoutEphemeralSubviewTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest", "layoutEphemeralSubviewTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "layoutEphemeralSubviewTest"));
+    print("----------------------------");
+}
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif b/Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif
new file mode 100644
index 000000000..06dbc2bc2
Binary files /dev/null and b/Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif differ
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html
new file mode 100644
index 000000000..e6325d134
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ layoutEphemeralSubview Test
+
+Created by Aparajita Fishman on October 8, 2010.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>layoutEphemeralSubview Test</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+        </script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading layoutEphemeralSubview Test...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/index.html b/Tests/Manual/layoutEphemeralSubviewTest/index.html
new file mode 100644
index 000000000..981d62c6a
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/index.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index.html
+ layoutEphemeralSubview Test
+
+ Created by Aparajita Fishman on October 8, 2010.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>layoutEphemeralSubview Test</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading layoutEphemeralSubview Test...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
+
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/main.j b/Tests/Manual/layoutEphemeralSubviewTest/main.j
new file mode 100644
index 000000000..ceb0a5ee0
--- /dev/null
+++ b/Tests/Manual/layoutEphemeralSubviewTest/main.j
@@ -0,0 +1,17 @@
+/*
+ * AppController.j
+ * layoutEphemeralSubviewTest
+ *
+ * Created by Aparajita Fishman on October 8, 2010.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}