fixed incorrect currentTarget and target