Fixed fix for #6056