fix issue 1592
Merge pull request #138 from niphlod/issue/1592

fix issue 1592