Is there any chance to improve this to make it consistent with the rest? (maybe in a separate issue)