Oops, forgot some sanity checks