Fix issue with currentTarget not being set correctly.