fix for issue 5051