Ugh, we really should get rid of that hack