Fix of Click functionality