Fix for RT#86896
Merge pull request #2 from dsteinbrunner/patch-1

Fix for RT#86896