Fixed handling click