Make more strict checks