Adjusted code for CLANG
Adjusted code for CLANG