[BUGFIX] Fix handling of ClosureFinisher