improving checking and avoid false/positive