Comment 8 for bug 264342

Please try the following patch and let me know if it resolves the issue. It seems to work for me. Looks like the Windows code probably has the same issue (haven't tested).