partial fix
Merge pull request #1 from devserg/patch-1

partial fix