Attempt to fix impossible to click objects

We were not able to reproduce this problem but we fixed two bugs that could be related in the tools.