Revert "removed check"

This reverts commit 21c7349ef917c5f3e5d4ada3cb18fbb5cd7de3e3.
Revert "Revert "removed check""

This reverts commit b9989ab02568bc48fa6f4612b57376ffcc282012.