Fixed company controller
Fixed client group controller