Fix to 6782675 (TO BE REBASED)