Hopefully fixed build regression in clang 3.1