fixes #962
Merge pull request #967 from sancar/fix/master/issue-962

fixes #962