re-add some checks