fix for #386
Merge pull request #387 from hrgdavor/fix-386

fix for #386