This should catch some of the cases of breakage...