fix issue 2093
Merge pull request #321 from timrae/issue2093

fix issue 2093