Click Detection Fixing