Bug fix for clang