Fix validity and correctness of r63342