fix for issue 384
Merge pull request #385 from fhinkel/384

Fix for issue 384