Looks like my last commit broke stuff... take two