@@ -35,11 +35,11 @@
 - (instancetype)init
 {
 	self = [super init];
 
 	if (!of_condition_new(&_condition)) {
-		Class c = [self class];
+		Class c = self.class;
 		[self release];
 		@throw [OFInitializationFailedException exceptionWithClass: c];
 	}
 
 	_conditionInitialized = true;
@@ -70,11 +70,11 @@
 }
 
 - (bool)waitUntilDate: (OFDate *)date
 {
 	return of_condition_timed_wait(&_condition, &_mutex,
-	    [date timeIntervalSinceNow]);
+	    date.timeIntervalSinceNow);
 }
 
 - (void)signal
 {
 	if (!of_condition_signal(&_condition))