CurrentClick crash fix