Fix issue with click on labels