BUG FIX : Click events no longer trigger twice