Adjustment to Objective-C version.