fix(clicks) handling click works better in this version