Fixed bug 66622 without breaking anything \o/