diff --git a/uikit/CSSLayout/Tests/CSSLayoutTests.m b/uikit/CSSLayout/Tests/CSSLayoutTests.m
index 12d50933..cd1e775a 100644
--- a/uikit/CSSLayout/Tests/CSSLayoutTests.m
+++ b/uikit/CSSLayout/Tests/CSSLayoutTests.m
@@ -46,4 +46,16 @@
   XCTAssertEqual(0, CSSNodeGetInstanceCount());
 }
 
+- (void)testUsesFlexbox
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  XCTAssertFalse([view css_usesFlexbox]);
+
+  [view css_setUsesFlexbox:YES];
+  XCTAssertTrue([view css_usesFlexbox]);
+
+  [view css_setUsesFlexbox:NO];
+  XCTAssertFalse([view css_usesFlexbox]);
+}
+
 @end
diff --git a/uikit/CSSLayout/UIView+CSSLayout.m b/uikit/CSSLayout/UIView+CSSLayout.m
index 9a31ec81..9a8eb645 100644
--- a/uikit/CSSLayout/UIView+CSSLayout.m
+++ b/uikit/CSSLayout/UIView+CSSLayout.m
@@ -56,11 +56,8 @@
 
 - (BOOL)css_usesFlexbox
 {
-  if (objc_getAssociatedObject(self, @selector(css_usesFlexbox))) {
-    return YES;
-  } else {
-    return NO;
-  }
+  NSNumber *usesFlexbox = objc_getAssociatedObject(self, @selector(css_usesFlexbox));
+  return [usesFlexbox boolValue];
 }
 
 - (void)css_setDirection:(CSSDirection)direction