Your corrected version doesn't work right after the first chorus, though.