Bug fix for clang++