Fix breakage for clicking