Fix to 5071 patch