Really fix shortutils