This looks already ok in master... Am I wrong?