Fix compile issue: Diamond operator is not supported