#FEC-1462 #comment fix from DP