fixed never punched out bug