Stricter validity check