Cookie tool behaviour fix