Yes. I mean, it was clever - you could see that chopping off the magic hair would solve everything, and that it would never, never occur to Rapunzel to cut it off (it certainly hadn't occurred to me that this was a possible solution) - but still, I wish they had come up with another way to end it.