Fix for #4920, needs to confirm