(#2588) - more tact