fixes #1085
Merge pull request #1275 from enesakar/master-terminating-services

fixes #1085