Add fix for the controller session stopping procedure.