Re-fixed bug #66469