Possible fix for CurrentlyClicked