Changed click behaviour