Attempt to fix diamond operator