Fix for old Clang versions

Change-Id: Ib902535c03a9f1b93a2c4ff3dd61d29e316bfd49