Fix #5751 - update 1