(Waupun) An inmate at Waupun Correctional was charged with assaulting a correctional officer. Timmy Johnson is facing a felony count of Battery by Prisoner stemming from the July 8th incident of last year. According to the criminal complaint, guards were administering medication when Johnson was directed to go to a holding cell. Johnson then allegedly started to punch one of the guards in the head and face area multiple times. Another corrections officer used pepper spray and other first responders were able to subdue Johnson. The 31-year-old is serving a 50-year sentence after being convicted of First Degree Homicide in Grant County in 2015. If convicted, Johnson faces an additional six years in prison. An initial appearance is scheduled in July.