Fix for bug #85
Merge pull request #103 from wnagele/6.x

Fix for bug #85