Also fixed bug #64726 in 5.3