Urk, forgot to build this one after merging and goofed a bit.