D-14567 Added logic to make behavior consistent