3.0: A fix for #5375 isssue