Diamond operator fix