fix CORE-993
Merge pull request #64 from ghostd/CORE-993

fix CORE-993