Added code to fix mouse click