Fix of the zero-intensity shutdown bug.
(My first push to the Project)