Fixed issue: 8391, cleaner fix.