Added a handling to avoid clicks on the same contianers