Fix #256: use currentTarget