(actually) fixed repeat bugs