fix for #4563