clang fix
merged