Fix build errors
Merge pull request #2702 from federicobond/fix-build

Fix build: Syntax error on token "<", ? expected after this token