Fixed diamond operators to work with source 1.5