Really fix the HyperSpec