diff --git a/Source/Class/Class.Extras.js b/Source/Class/Class.Extras.js
index f058d08bf..001e4a56a 100644
--- a/Source/Class/Class.Extras.js
+++ b/Source/Class/Class.Extras.js
@@ -108,8 +108,7 @@ this.Options = new Class({
 
 	setOptions: function(){
 		var options = this.options = Object.merge.apply(null, [{}, this.options].append(arguments));
-		if (!this.addEvent) return this;
-		for (var option in options){
+		if (this.addEvent) for (var option in options){
 			if (typeOf(options[option]) != 'function' || !(/^on[A-Z]/).test(option)) continue;
 			this.addEvent(option, options[option]);
 			delete options[option];