[FIX] fix some checks