possible fix for #166
Merge pull request #167 from Project60/issue_166

possible fix for #166