add stricter check for true