Improved the fix for bug #67072, thanks Nikita