Use more stricter checking