Now compiles properly with Clang