disableClickPropagation added again.