Second attempt to get the damn thing to compile.