Fix for the change Request DP3-504