diff --git a/forms/OptionsetField.php b/forms/OptionsetField.php
index 554a9e84a..ae70d9fb2 100755
--- a/forms/OptionsetField.php
+++ b/forms/OptionsetField.php
@@ -38,12 +38,12 @@ class OptionsetField extends DropdownField {
 			$odd = ($odd + 1) % 2;
 			$extraClass = $odd ? "odd" : "even";
 			$extraClass .= " val" . str_replace(' ','',$key);
-			$this->disabled ? $disabled = " disabled=\"disabled\"" : $disable = "";
+			$disabled = $this->disabled ? 'disabled="disabled"' : $disable = '';
 			
 			$options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled/> <label for=\"$itemID\">$value</label></li>\n";
 		}
 		$id = $this->id();
-		return "<ul id=\"$id\" class=\"optionset {$this->extraClass}\">\n$options</ul>\n";
+		return "<ul id=\"$id\" class=\"optionset {$this->extraClass()}\">\n$options</ul>\n";
 	}
 	
 	protected $disabled = false;
@@ -51,8 +51,6 @@ class OptionsetField extends DropdownField {
 		$this->disabled = $val;
 	}
 	
-
-	
 	function performReadonlyTransformation() {
 		// Source and values are DataObject sets.
 		$items = $this->source;