Fixing double clicking