Added sanity check