Added back in some checks that get overwritten