Bug fix for overlap click listener