Fix for 6166

Fix for #6166