Fixed grouping of new window arguments