Update for Clang bug