Bug fix for clang++-3.4