Fixed Hire and Fire issue