Revert "trying to fix"

This reverts commit 2debcf69940c544d0dad88022942a9f585adba7d.
+ more checks