A little overzealous with the replace, and forgot some supers