SERV-4878 fix forking problem
Merge pull request #2 from fanhattan/SERV-4878-fix-forking-problem

SERV-4878 fix forking problem